Autogenerated HTML docs for v1.8.5.2-227-g53f347
diff --git a/git-pack-objects.html b/git-pack-objects.html index 6cca916..afe6c47 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html
@@ -793,8 +793,7 @@ <base-name> to determine the name of the created file. When this option is used, the two files are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash - of the sorted object names to make the resulting filename - based on the pack content, and written to the standard + based on the pack content and is written to the standard output of the command. </p> </dd> @@ -1108,7 +1107,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2013-12-27 16:32:55 PST </div> </div> </body> diff --git a/git-pack-objects.txt b/git-pack-objects.txt index d94edcd..cdab9ed 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt
@@ -51,8 +51,7 @@ <base-name> to determine the name of the created file. When this option is used, the two files are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash - of the sorted object names to make the resulting filename - based on the pack content, and written to the standard + based on the pack content and is written to the standard output of the command. --stdout:: diff --git a/git-push.html b/git-push.html index 5cf435b..508c6bf 100644 --- a/git-push.html +++ b/git-push.html
@@ -803,8 +803,13 @@ <code>HEAD</code> (see <a href="gitrevisions.html">gitrevisions(7)</a>).</p></div> <div class="paragraph"><p>The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must -be named. If <code>:</code><dst> is omitted, the same ref as <src> will be -updated.</p></div> +be named. +If <code>git push [<repository>]</code> without any <code><refspec></code> argument is set to +update some ref at the destination with <code><src></code> with +<code>remote.<repository>.push</code> configuration variable, <code>:<dst></code> part can +be omitted---such a push will update a ref that <code><src></code> normally updates +without any <code><refspec></code> on the command line. Otherwise, missing +<code>:<dst></code> means to update the same ref as the <code><src></code>.</p></div> <div class="paragraph"><p>The object referenced by <src> is used to update the <dst> reference on the remote side. By default this is only allowed if <dst> is not a tag (annotated or lightweight), and then only if it can fast-forward @@ -1722,7 +1727,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-09-17 14:33:14 PDT +Last updated 2013-12-27 16:32:55 PST </div> </div> </body>
diff --git a/git-push.txt b/git-push.txt index 9eec740..2b7f4f9 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -56,8 +56,13 @@ + The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must -be named. If `:`<dst> is omitted, the same ref as <src> will be -updated. +be named. +If `git push [<repository>]` without any `<refspec>` argument is set to +update some ref at the destination with `<src>` with +`remote.<repository>.push` configuration variable, `:<dst>` part can +be omitted---such a push will update a ref that `<src>` normally updates +without any `<refspec>` on the command line. Otherwise, missing +`:<dst>` means to update the same ref as the `<src>`. + The object referenced by <src> is used to update the <dst> reference on the remote side. By default this is only allowed if <dst> is not
diff --git a/git-rebase.html b/git-rebase.html index 5a5f627..be4e4d7 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -1175,6 +1175,22 @@ <a href="howto/revert-a-faulty-merge.html">revert-a-faulty-merge How-To</a> for details).</p></div> </dd> <dt class="hdlist1"> +--fork-point +</dt> +<dt class="hdlist1"> +--no-fork-point +</dt> +<dd> +<p> + Use <em>git merge-base --fork-point</em> to find a better common ancestor + between <code>upstream</code> and <code>branch</code> when calculating which commits have + have been introduced by <code>branch</code> (see <a href="git-merge-base.html">git-merge-base(1)</a>). +</p> +<div class="paragraph"><p>If no non-option arguments are given on the command line, then the default is +<code>--fork-point @{u}</code> otherwise the <code>upstream</code> argument is interpreted literally +unless the <code>--fork-point</code> option is specified.</p></div> +</dd> +<dt class="hdlist1"> --ignore-whitespace </dt> <dt class="hdlist1"> @@ -1941,7 +1957,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-09-17 14:33:14 PDT +Last updated 2013-12-27 16:32:55 PST </div> </div> </body> diff --git a/git-rebase.txt b/git-rebase.txt index 94e07fd..2889be6 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -324,6 +324,16 @@ the reversion" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details). +--fork-point:: +--no-fork-point:: + Use 'git merge-base --fork-point' to find a better common ancestor + between `upstream` and `branch` when calculating which commits have + have been introduced by `branch` (see linkgit:git-merge-base[1]). ++ +If no non-option arguments are given on the command line, then the default is +`--fork-point @{u}` otherwise the `upstream` argument is interpreted literally +unless the `--fork-point` option is specified. + --ignore-whitespace:: --whitespace=<option>:: These flag are passed to the 'git apply' program diff --git a/git.html b/git.html index a937c04..307d5b9 100644 --- a/git.html +++ b/git.html
@@ -2527,6 +2527,24 @@ temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p></div> <div class="paragraph"><p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1 parameter, <path>.</p></div> +<div class="paragraph"><p>For each path <em>GIT_EXTERNAL_DIFF</em> is called, two environment variables, +<em>GIT_DIFF_PATH_COUNTER</em> and <em>GIT_DIFF_PATH_TOTAL</em> are set.</p></div> +</dd> +<dt class="hdlist1"> +<em>GIT_DIFF_PATH_COUNTER</em> +</dt> +<dd> +<p> + A 1-based counter incremented by one for every path. +</p> +</dd> +<dt class="hdlist1"> +<em>GIT_DIFF_PATH_TOTAL</em> +</dt> +<dd> +<p> + The total number of paths. +</p> </dd> </dl></div> </div> @@ -2834,7 +2852,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-12-03 14:06:33 PST +Last updated 2013-12-27 16:32:55 PST </div> </div> </body>
diff --git a/git.txt b/git.txt index cc0e5e2..aec3726 100644 --- a/git.txt +++ b/git.txt
@@ -807,6 +807,15 @@ + For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, <path>. ++ +For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables, +'GIT_DIFF_PATH_COUNTER' and 'GIT_DIFF_PATH_TOTAL' are set. + +'GIT_DIFF_PATH_COUNTER':: + A 1-based counter incremented by one for every path. + +'GIT_DIFF_PATH_TOTAL':: + The total number of paths. other ~~~~~
